Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 4 Mar 2012 18:00:44 +0000 (10:00 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 4 Mar 2012 18:00:44 +0000 (10:00 -0800)
commit03da30e7488337ee91a90a74c5ee8601fb877f6c
tree961ed398c0e16b0ab26364a61a529e8d2b114ccd
parent44cfa62694e9420406893a03655f36faf85fc118
parent601c176bcc049abfff7baa410ed02502d62b6755
Merge from trunk.